Fix some multi-file corner cases with asm