More fixes for context send indexes and ASTPCNodeVisitor