Fix formatting issues necessary for upstream inclusion