merging the two rules. `mode' attribute now takes a string arg. Delete the rule for an identifier as arg. From-SVN: r6913
