Extend @data and @pdata macros to handle non-array literals