Discovery code reshuffling.