Fix two-phase name lookup goofs detected by gcc but not VC++.