Almost all of them were getting redirected correctly, but why keep the
old ones.  Also update a couple nitpicks directly around.