Refactor assembler.*