improved CoordinateVariable wrapping