Minor cleanup based on @aarondav's code review.