Cleanup: Use single path_obj to simplify code