Bug 1004363 - Follow-up patch to fix a few more places that should ignore trivial blocks on ARM. r=me