Fix a few possible problems discovered in -O0 / eabi experiments.