This isn't new to this pull request, and wasn't picked up on initial reviews, so can we take care of this separately?