Optional context; improvement of context-finding around punctuation