Improving the Income Tax treatment of Discretionary Trusts