Massive refactoring to clean up the legacy otre code.