I would prefer if the new API always returned an array of length 1 instead of having a different type.