Merge "Fix RegType invariant checks."