Factored ARM changes into existing patches plus a new assembler patch