Revert "Calculate sizes instead of using constants."  Unit tests failing.

This reverts commit 0885bac5bf3b4d80e8a0c1787c28e7fd3540fae5.