First step toward non-spaced delimiters

Now the starting delimiter can be part of the same token
as the start of what it delimits.  WIP
code cleanup
code cleanup