Fixed yank idea

Code is cleaner than ever. Minimal deref.