anywho: totally happy to land the checkstyle change behind an option