Modify choose/collect macros to enable PartialFunction inlining

by invoking applyOrElse instead of apply, since anonymous partial
functions define only the former.