Even moar Clang warnings resolved.