Some (hopefully final) checkstyle fixes

woo

(The $label removal comes from pmd, and it was completely unused)