Remove unneccessary scope-passing-around, partly.