Fix comment and add two wrappers to itype.
Removed dead code.