Move these between base types and key exchange to keep them in order.