more fixes towards supporting conditional arguments in productions