ARM: Simple cleanups and definition reordering