Prepare support for closures (by moving even more logic to runtime)