Small tweaks.
Trace top-level goal so we catch all the sub-goals nested inside instead of just the last.