Fix skip and (especially) take.