Resolved code review comment from dfoster.