Include more expression types in ast_to_intermediate