Add more missing cases to simplify_subtype