I see the PlaceHolderVar issue turned out to be a pre-existing bug after all.Rebased version attached.
Regards,Dean