Use maps where wanting

Comments seemed to indicate so.

Change-Id: I63d0524d134d8be166403cfa9d6400cecc1749ed
Merge "Use maps where wanting"