You're correct...and now it's time to pat him on the back and say "great job, now follow the law". He or any politician should follow the rules and go on his/her merry way. NY has term limits and his term is up.
We shouldn't change rules in midstream just because he did this or that.
I say this rule should change with every gubernatorial or presidential term. Not and extended term, but the ability to stay on and advise during extreme situations.
Anyone who knows ANYTHING about politics knows that the first few months of an incumbent are nothing but figuring out how to drive the big @$$ "vehicle". In normal circumstances, this is fine, however under such trying circumstances as now, not even one single day is acceptable.