Make Self clause explicit in trait item declarations

Make Self clause explicit in trait item declarations #1798