Cleanup `nonEnumProps` assignment.
Simplify `baseFlatten`.