Update: converting GetWaterInfos to indirect form - Not propagating indirection params yet - running on dummy forward range - Sprinkled ReadOnly usage in prep for cleanup Tests: ran unit tests