Merge pull request #1206 from comex/amperspocalypse Change a bunch of reference function arguments to pointers.
