Made s.map support s.map() and s.map(key).