Restructuring data to avoid use of .-path