Improved codestyle for bug#10295.