Clean up onetouch a bit.