Outline: Converted to Xtend, fixed handling in derived systems.