Have makeRefStr() accept a context object rather than individual params.

Change-Id: Id52e02aa29d85d207420c80a95ada2f8487f165f