Join some classes together

The claims step is no longer needed since we have no claims table.
Having distinct EntityInsertionStrategies for Items and Properties
is also not needed at present.
Why no `instanceof`? Just asking, I don't think I have a preference.