More coding style adjustments.