Reduced the amount of breaking Add Trackable can do, but there's still a lot.