Cleaning up type aliases

RIO and AIO changes
@markhibberd 
Waiting on ambiata/poacher#19, ambiata/saws#69, ambiata/notion#46, ambiata/ivory#537