Switched to full set of frames (unless trace() is called as wrapper), removed header