Merge Jon Kessler's suggestions.