Add return_terms option.