I hit "merge" before pushing an updated commit with feedback from #1338.

This commit has some minor updates to the PR.