Add call and macro tags to the self-closing dict