More use of foroption

Quill now uses the "foroption" command in all appropriate places.