Second step of migration to RoboGuice. Many classes (but not all)
updated.