minor cleanup detected by clang++
clang++ 3.4 defines/compat