Migrating to Eclipse JDT 4.21 from 4.20