Smooth scroll; fix-ups requested by @philc.