GCC had a couple of "ambiguous" complaints as well as an overlapping variable used for both in and out. Fix these nits before gcc49 comes in.
