switched to only exprs and blocks, seems to work :)