Let's use the pidref variants for waiting and checking a process everywhere and get rid of the non pidref variants.