Add further polishing prompted by various good suggestions.