I'd tend to split this out into the cosmetic commit - saves having to analyse the commit when bisecting later on to figure out when something broke.