Refactor, but not fix, origami-next-fold