DVPL-5298 | Resolve dfoster's first round of code review comments.