wip for #618
oops, forgot to add semexpr. wip for #618