remove RET hack, add proper support for rets (watching out for ret voids)