Moved the decision to load p/c fielddata eagerly to a better place.