Move TrvStack def so a little better