Refactor lookupFixityRn-related code following D1744