Sorry, there was a ton of conflicts when merging PrimitivePipeline, obviously I didn't clean them all up as well as I thought I did.  I'll fix this and your other comments.