fix flush ordering issue with embedded dependencies; leave container normalization up to the container