Highlight more parts that need to be refactored out.