Expand & correct the conditional icodes