Self/Character problems

The recent changes in separately entering Cast and Self credits have resulted in a problem which I don't believe appeared right away, in that performers appearing both as themselves and as sketch characters are having "Self" inserted before each character name. For examples, see Paul Rudd's appearance as guest host on the December 7, 2013 episode of SNL, or Johnny Carson's various appearances as Carnac the Magnificent.