Fix gcc warnings found when building on i386. (#629)

Unfortunately -Wshadow=compatible-local does not seem to be available when
using llvm as the compiler. Still, debian builds for Postgres community are
producing warnings that we can fix.