Add “choose” and “tool” identifiers.