More clean-up so that the theme methods contain all of the logic, and so
that the main code path can be more _single-responsibility_.