Fix Expand for path of len <= 1.