Better enforcement of Rank class immutability