client checkstyle follow up to #2807