Flogger:  made some of the classes 'final'