Remove unnecessary function wrappers and type annotations, and add skipWhilei and takeWhilei.