Reinstate properly typed code.

Eclipse users, please uncheck:

  Preferences -> Java -> Compiler -> Errors/Warnings -> Generic Types ->
    Generic type parameter declared with a final type bound