Apply maintainer's suggestions.