More tweaks to hopefully please GCC.