Improve consistency when explicitArray + mergeAttrs are both true

When the explicitArray and mergeAttrs options are both set, ensure
that nodes introduced by attributes are put into arrays.

Previously