Begin refactoring to make comparison methods available to other entry points