Bug 881382 - Cleanup some ARM code to be more consistent with the corresponding x86 code. r=mjrosenb