Manual merge of #264

Thanks for the contribution, @tootedom!  Apologies for the long delay in looking at this.  This looks like a good optimization via eyeballing, though I haven't run any perf tests to confirm.  Regardless, this change will make the non-exceptional path never invoke the ISE construction, which is definitely a good change.