Small refactorings, still figuring out what is broken.
No longer warp at last tapstop - that is weird and incompatible.