Undoing last commit as decided it was bloat.

Does not add any real benefit over calling the WordPress functions directly.