minor cleanup to make it compile with clang which is more pedantic.