Repairing after a merge.

Starting this project up again, and the code wasn't left in the best
state. Somehow a pending merge was committed.