Shortened evaluatePath(), moved dependencies