Fixes #2738 This follows the convention set by the existing method of passing a TrapSink by adding another argument for a StackMapSink.