Fix the data and pdata macros

Remove the evil eval call and evaluate literals in the caller's scope