More complete s/type/variant