Clean-up and simplify E4 ModelAssembler#2427

HannesWell merged 1 commit intoeclipse-platform:mastereclipse-platform/eclipse.platform.ui:masterfrom

HannesWell:cleanup-modelassemblerHannesWell/eclipse.platform.ui:cleanup-modelassemblerCopy head branch name to clipboard