ad hoc redirects. Some judgement calls. Fixes #960.