Merge "Tidy RegStorage for X86."