Refactor and switch to RoboGuice3.