Merge pull request #247 from apple/revert-242-sizeof

Revert "Use sizeof more pervasively"