Move ptrs back to const-refs
Support VS2013.4 again, wow is it terrible