Everything's in place. It remains to restore the remaining actions and
to name them more properly.