All works, even further than the very first version (see comments there)
Beginning support for pairs of punctuation (ciX works for now)