Refactoring in preparation for soosie release.