Make mapping logic to depend on ClosureEntities. Not yet fully fixed but still saner way to debug.