Minor improvements according to "isKindOfClass:" method usage.