Some more cleanup and fix to Assembler texture.