Improved function nomenclature.

As this wasn't a terribly vital commit, I'm afraid the finer points
escape me. Some slight restructuring here, some slight regression fixes
there, and away we commit to vitiating finality!