Cleaning up type aliases

RIO and AIO changes
@markhibberd