More fiddling with coding style. Isn't this fun?