More accurate use of szipWith and smap - no change in performance

also added inlines for extract/combine fns