Adjust to GNU coding standards
A variable definition with initialization shall have only one variable per type.