Fix scoping bug in new GCodeAnalyzer