Allows a function taking zero arguments to be passed to `r.map`
Fixes review feedback
Merge branch 'next' into sam_timestamps_with_a_vengeance