Fix some ClassRemapper errors.