Clean up some style warnings outside of the reverted commits.

https://bugzilla.redhat.com/show_bug.cgi?id=1122279