Fixed debug flags to define NDEBUG, rearrangement.