This patch: - changes interception API so that it better aligns with what we'd like to see in #121 - fixes the issue with redirect interception Fixes #217.