Move more stuff out of jl_uv