- Fix issues on arm7, now no warnings on both arm7 AND arm64

@ndonald2 Turns out I made new warnings on arm7 when I did the last round of format changes,. These work on both.