Extract some common entity-adapter bits
More entity-adapter extaction
checkpoint changes, still not really happy
Tidy