Honor asm.comments in more places