Moving more random generators to random.