Merge "Removes redundant RefBase inheritance."