In followup to #1310: Remove more exception indexing.
3 files changed