review fixes + added rebind test

-changes based on Sam's review on Gitter.
Does this work? Without warnings about the enricher failing to be reconstituted?