Fix StmtContext nullness problems