Tweaks suggested by M.Dorrington.