Separation of constants. closes #28