Tweak coding style again.