use basop comparators for enums - undo unnecessary changes in inactive code -...

use basop comparators for enums - undo unnecessary changes in inactive code - comment harmonization macro