v0.5.1: improves symbol handling.