Trim trailing whitespace
Add stream loading via Marshal
Remove accessors for removed instance variables
Track only references, not the referencee