Merge "idmap2: move static functions to anonymous namespaces"