Because I failed to see that PISMHydrology_bwp already existed, I proceeded to duplicate it ... with error ... as PISMLakesHydrology_bwp.  Now I've removed that.
Removed velocity_staggered_whereWpositive() because it was the only form being used.  That is, put the Wstag>0 check directly into velocity_staggered().