Some codestyle cleanups
Just a bunch of patches that accumulated but that I didn't want to squeeze into 0.29.0. No (intended) functional changes.
Just a bunch of patches that accumulated but that I didn't want to squeeze into 0.29.0. No (intended) functional changes.