Merge "Clean up interface check cast"