More tidying.
Move more initialisation data into Initial.