Upgrade to CSScomb 1.2.1 and reset some ordering to ensure no rogue spaces

BS3 commits: 4376ce84667264f63048bc3d13541bf273052579