Fixups. Squash into this commit.
Refactoring.
Moved the OntologyVersionRecorder listener.