Thanks, the code changes all look good to me now. However, it just now struck me that there should be corresponding changes to manual/search.texi and manual/string.texi to document the new restrictions on callers.