Adapted to syntactic 1.10 with new tree drawing functions