Separate a possibly-nil element from dict init

Prevents a gotcha when adding elements after this element in one of the dict
initializers
Version, changelog
Merge branch 'v2.8.3' into development