Minor scala syntax cleanup.