Simplify armjit. Revert 40b2a8d.