Issue #2226267 by fago, xjm, Berdir: Improve default value handling of fields to be consistent.