Added quotes around the 'without' option values, otherwise it sometimes
(frequently) blows up.