More conversions to const references.