Update after code review comments incorporated and all tests rerun.