Cleanup patch after "struct stat_ex"