Remove double-use of logging.
Remove seldom-used std::reference functions.