single-level maps suffice now that dynamic derivations are gone. Change-Id: If29998b104b31255292ab0c789622d7d27040f69