Modified some functions that were returning pointers to instead return
references. Although the way we were using them was technically identical,
references make more sense for coding style and cleanliness. Probably.