Merge "Use correct register class for refs"