Merge pull request #7621 from daverodgman/sizemax

Remove DIY SIZE_MAX definitions