Source cleanup for asm.spt, mainly to align branches.