Minor refactoring of activation provider.