Fix #4338

And some code standards.