Minor cleanups discovered during sqlcoverage rework. Passes jenkins.