Worked in a few additional code review comments.