Incorporate changes suggested by @kieve.