Got returns to work - it's a bit hacky, but it'll smooth out once I get register allocation in.