Cleaned up more stuff, cleaned up ITrace output.