Restored some accidentally removed `final` modifiers.