hash-identifier: first cleanup for 1.1-2