Improved parameter quoting in various places.