Crosspath handling. Fixes #7