Update FinalStateAnalysis to latest HEAD