A bit of future-proofing of the AIO_OQ interface design.