Fix regression of code-reformatting