Fix a few Mapped<Definition> to Mapped<? extends Definition>