Feature/redirection strategy cleanup

Supersedes #83 and fixes #91