Merge "idmap2: Remove more redundant "using" statements"