nit: more final line issues here and the next 6 files.