Remove some more unnecessary var wrappings