Style changes for hadoop-compatibility.