Remove a few more pass-by-references