Autoupgrade + small refactoring

in general I do not see for this methods reason why it need to be in scc_auto as it looks like generic enough to work also for inst_scc, so it should be shared. Or did I overlook something?