Re-enable some asserts in macro-asm and minor cleanup.