Merge identifier variants whilst keeping compatibility.

This will smoothly migrate all identifiers to V2.

Fixes #56.
Fixes #79.
Fixes #149.
Merge pull request #420 from ambiata/topic/one-identifier

Merge identifier variants whilst keeping compatibility.