Some more improvements to ARMMain.