Move the last bit out of the legacy entity.h/.cpp file pair