Upgraded rule identities and unparsing