x86, um: get rid of more uml asm/arch uses