Committing long-uncommitted and possibly broken changes.

Coming back to this codebase to find inconsistent changes between the
master branch and work on my laptop. It feels bad, but there seems to be
some functionality I want committed.