Debugging and cleaning up after last refactor.