Incorporate comments from @otfrom.