Fix a couple of __REDIRECT () __THROW occurrences