825 lines?!  This file is __massive__.  I prefer that most/all of these inner classes were just refactored into separate files (if possible), so as not to make the file a giant, unreadable monstrosity (as it currently is).