Cleaned up some accessors used for tracking.