r6516: use only one list of scalar types and make "string" just a simple scalar type...