Remove some old work arounds for coverity.

2021-01-02, Gary Kramlich