Merge "Distinguish between soft/weak/phantom/etc references in ahat."