Conversion to instancetype from id and removal of debugging code