Merge "Cleanup: replacing xd->seg with seg, and xd->lf with lf."