KJ-4 Convert typed expressions into expressions with casts. Corrected a last unexpected bug. Tests should pass.