Cleanups found during review

2019-07-22, Gary Kramlich