The regulator is also working on rationalising settlement, margin and risk-management provisions