Clone params always.
Fix propagate state to properly take into account the leading state name.