Make #54 path-independent.