[HB] Simplify MarkBase and MarkLig too
drwxr-xr-x - src