[utils] More portability cleanups.