(Lakka) Move more variables over