Fix to work for ASM5. Reformat some.