cleanup analog to P::W::S::consumes

Hope you like it. Sorry for the trouble!