Replace with diamond operator.
Avoid getting the session until necessary.
rename.
rename.
Have the guice infrastructure add a 404 termination handler within the guice-backed-registry context.

This was previously being special cased for the Groovy templating module. This change makes that unnecessary and means that any custom client error handler will be used.