Used initial boundary matchers everywhere and everything worked great.  Discovered logic/strategy problem with internalOrTerminalBoundaryMatcher and setInternalOrTerminalBoundaryMatcherType.  Going to rewrite boundary/delimiter matching.  Committing first.