Moved handling of empty restriction sets out of parse-vars-and-rsts and into expand-rsts.