Tweaks, renames, and a few helper methods.