fixup! fixup! add cast expression support