Try to fix clang compilation failures with the -fsized-deallocation option.

Try to fix clang compilation failures with the -fsized-deallocation option. #2942