Minor refactoring for main requires list.