Genericize CoreEntity joins
Cleanup
Rename internal function for clarity