Minor cleanup for utils.hpp