-pedantic fixes with clang 3.3