Fix unidentified bug by switching back to stepping over term-lists.