Reduce overloaded-function-bloat, fix style.