Fix for assemble.test; problem was a total assumption failure caused by way that the assembler works.
Merge assemble revert.