Trying to fix a pp error on Sun... using a separate macro to force expansion but not sure if that was the issue.