Optimised some names, changed some genmodel details, as per Colin's
notes. Composed machine extends EventBNamedCommentedElement