OF-2: Suppress extraneous stack trace info

Second attempt to address this issue, this time without changing the S2S
exception handling flow.