Thanks to all who replied,

I think I'll go with removing the elbow/thermostat housing, or maybe
the whole water pump. Good time to replace some hoses too.

Tom in Minneapolis