A bit of refactoring, because Guice was not seeing Authentication and
Authorisation bindings.  See #37