Adds parse-arglists and make-option-specs