fix #1
it means less messing around when adding/removing skipWith, and todoWith is just changed for consistency