Sync to head; fix up option variable.