Continued cleanup of ASM code