Fixed Expand clause processing in V4.