Tidy up trace calling.
