Try to be clever about inserting space before/after a yank
Fix delimitation on closing stuff