Use forte_number_re from M'AU; other minor things.