Tidy up PSEModel, its superfluous storing of the non-deterministic choices.