Style fixes, no functional changes

* Pointed out by Axel and Ingo.