Tidy up XML Comments support code