Second coding style clean-up.