Revert "process 'notfactor' before 'factor'"

This reverts commit ec0f9e0c6c2f6184626db61bcbc5b3275c82b5db.