Autoupgrade + small refactoring

I already thought about that, but the `inst_scc.rb` equivalent behaves little bit differently and it would need some more refactoring which I do not dare to do just before the last RC.

So at least I added a `FIXME` note...