Make some declarations formatted the same as the definitions