fixes 'which' rules (except for newly discovered issues (see comment in scheme-rules))