Fix astyle-related oopsies