Why are these needed for this commit? I guess this is for ports integration? If so, let's do the fix for `isArray` separately so they can each happen in one coherent batch.