Make core fields' has-data check more consistent.

As discussed in #1978.
Merge pull request #1979 from michael-e/fix-core-fields

Make core fields' has-data check more consistent. RE: #1978