I'm in the same boat as Cad, in that when I removed my manifolds, I took everything out at the same time, but I would certainly agree that for all the time it takes, you're probably as well to remove the water rails first. Just remember to refit the rails with new o-rings after.