More OakbotDoclet refactoring.