Renamed CashIndex type to ONIA
Loosen unnecessary restriction on inner constr

Reverses changes made in a1242f7