Integration of new Guice extension, issue #489. Reported and contributed by Tim Peierls.