Removed a bunch of non-essential ref usages to make them easier to wade through later.