Don't replace ot_lfree and stuff yet though...to much code churn.
This is GCC-specific, but it makes the code significantly cleaner.