This patch removes a single-line inline function and replaces it with it's
expansion everywhere.   The inline function was really only there for a
transitional step.