Issue #2226267 by yched: Improve default value handling of fields to be consistent (follow-up).