Move several rare redirects deeper in the tree

Also, start using bare "Redirect" where possible, since the regular
expression matching of "RedirectMatch" is a bit more expensive.