Tested StackTraceScrubber change; minor cleanup