more cleaning

- gets rid of the big regexps
- handles diff require cases in cond
- simplifies test-require-used