Fixes for a clang static analyser warning.