Cleaning up of constant default values.