More "old GCC" fixups (nw)