No more locals() stuff