Move content type checks to environment resolve