Minor A* cleanup