Modified the assembler parser to make it easier to write a linking stage and reuse the extant parsing machinery