Use const references in a few more places