Fix a classic bug again (now in armjit), + a minor opt