Fix WaterObject TODO: Retrieve sampler numbers from parameter handles, see r22631.