Support stack trace parameters and `on T catch` clauses.

Support them by adding an extra argument to the catchError callback for
stack trace parameters, and an extra argument to catchError itself for
'on T' clauses.