Cleaning up checkstyle warnings caused by 5976159

Looks like the workaround for Guava 1635 will be with us for a while on 1.7.x