fixes #1395

Not ready for merge until we determine what to do in case where a subclass has both `onconstruct` and `beforeInit` - see #1395