Refactor add_ubiquitous_token_actions method
Handle built-in symbols correctly in conflict manager