ifndef WITH_INTERNAL_METRICS then lets not
cppcheck inspired cleanups
FORMATTING ONLY; astyle -A10