Bug 824473: Nits + fix for ARM builds, r=dvander