Trimming more fat (~600 lines) out of ARM7.