Yet more picky compiler fixups