This was already fixed in 0d906798, but I failed to update the
array-formatted case.  This is not backpatched, since this only affects
the code path introduced by commit a6762014.