Merge "Change reference processing to use heap references."