patch token yanking

Simple enough for now.