FIX: fix over-zealous simplification
FIX: fix over-zealous simplification

arkilic/metadatastore,ericdill/databroker,ericdill/databroker,hhslepicka/metadatastore,tacaswell/metadataStore,arkilic/metadatastore,NSLS-II/metadatastore,NSLS-II/metadatastore,tacaswell/metadataStore,hhslepicka/metadatastore