As discussed on IRC, we will hold off sweeping code style changes to a separate PR.