pre: replaced all uses of p() and ps() with the new 'array of variant' syntax.