Change tracing, new way to nest things

This fixes #413, and in general is more sane