address more problems with clang (and follow its optimization hints)