step1 variants now implemented via macro; map and filterMap now return NSMutableArray
convenience aliases
map functions now return mutable instances