editorial: shlightly shuffle defines in options.h