JAL-1988 tidying, plus don't add Preferences to Tools menu on a Mac\!