Avoid now-illegal passes by reference