Use automatic numbering

DRY. Less merge conflicts. Easier reordering.