Start refactoring the new evaluation code to make it smaller and more manageable.