Simplify map_through

Make simple things simple :cat2: :hamster: :hamburger: