* Further fix for the travis call.
* Const, reduced scope.
* Const, reduced scope.
* Reduced scope + const.