Add support for ranks up to #200k (or anyone who can fc a normal diff)