Fixed up some sloppy visibility and final-ing.