Adding a helper to adjust columns to Entity fields WIP; cleanups.