Migrating to Eclipse 4.30 from 4.29