Issue #151 Refactored assembler macros.