[#1732] astyle cleanup before 4.0.3