@agorrod: the latest build kicked out a Coverity complaint and minor lint.

None of this is interesting for the release, take or or not, I'm just getting it into the queue.