Minor code style changes

Didn't like some of the places ReSharper switched to using "var"
statements, because it wasn't 100% clear from the context what the type
would be.