Fix a bunch of stuff that was found in review.

2020-04-26, Gary Kramlich