Seems to have gotten rather messy lately, as a consequence of a couple
of large recent commits.