[UP-4071]  Updates based on code-review comments.   I still have outstanding unit-test work, but wanted to get this committed earlier so that reviewers could look it over still.