Should we maybe rename back *BinaryDict* to *Dict* in another change for simplicity? Change-Id: I8f7dcb78b9bdf1a13ce403a997fbb8619f2b453b