Misc cleanups -- Pass args by const reference rather than by value