Clean up conversation setup a bit.