Style fixes to fix build in previous

Exactly what I said before.  Never push without first a full build
test in Travis...