changed inheritance relations to match core changes
Merge branch 'no-inherit' of https://github.com/rwcarlsen/cycamore into rwcarlsen-no-inherit