I reworked the logic a bit in 683b224 so that the awkward `[].flatten` is avoided.