modestly more consistent path handling