Simplify our stacktrace parsing and fix tests
Add some comments