Replace more sizeof's that had hardcoded types.