Minor cleanup. #1447

@agorrod Here are the minor cleanup changes I mentioned the other day relating to the change in #1447.  Please review.