fix up some number vs number-string processing, and handle lists/tuples better