fixup! add cast expression support