Fix generics for Enrichers under OpenJDK 6