Use reference-to-const where appropriate.
Merge: Use reference-to-const where appropriate