Moving more constants into Initial.