Brought in Hugo's checkstyle