Some progress in cleaning up the assembler.