RSTP: facktor out statemachine and minor renaming