Fix up requires to use srfi-1 less, and in a uniform way. svn: r9030 original commit: b0f41af021a188542867fddcfcb6b051206abf85
svn: r8864 original commit: 0d54ed5e7427f5e75e6274cc3c9625e676fc34bc