Refacting out cppcheck warnings.