...by turning the relevant ctor parameters into "const &" (following
8f30da63 "Some clang-tidy
misc-move-constructor-init").

Change-Id: I6686dabe2f05156d6ecd49aa76a3a1166ccac045