Fix some extra cases in list toggling.