Minor

Use pointers instead of references, in preparation for upcoming change.
3 files changed