Replace separate options for stpm, mdl0 with a --deep option