replace r-map with map-rest

As per Steve Miner. r-map used explicit recursion. map-rest is much
more elegant.