And actually, it dawns on me that maybe the thermostat cover would be easier to remove (and less likely to result in headless bolts) if I just took off the whole water pump assembly and then pulled the t-stat on the bench.