Updating to tbalden's Gerrit suggestions.