#300 cleanup
#300 cleanup
merge master
#301 special-case cts.search param, and generally enable different mappings for return type quantifiers vs params