PathTreeMap code cleanup