Ensure size parameter for GROW_ALLOCATION macro is an int
Some macro cleanup