Some changes over time (see diff).