Vi2vo: fix handling of univ constraints coming from the body
STM: cleanup code for Admitted