Move UITableViewCell and UIView categories to use instancetype. Remove safe block macro.