Issue #161: Cleanup some rather naff inheritance