Implement hflynn's suggestions.