Generics got lost during merge. Seen by the only unchecked warning (core now compiles without any unchecked warning!)