More rewrite-return tweaking