MFC r318593:

Fix build of AIO tests with -DDEBUG

Also, redefine some constants for clarity. No functional change.