Better symbol handling