hfm: better reversible primary keys