Fix closure shim with return value, fix string literals with chunks