Fix-up PP Code to reflect new lifetime param syntax