Incorporate @ethomson's suggestions.