Use updated default baseline proportions file.
Move default definitions to the top.