Now supports traceur as well.
Merged.
Clean up.