* Fix clang compiler warnings

* Remove unintended file.

* style

* Not part of PR

* Another extra closure ref

* More warnings from merges

* Lambda arg was used

* Remove remaining osx compiler warnings

* style

* Try to avoid compiler warning

* Same for the other test