Merge "Added a simple check for stray tracked refs."