Make some static_assert()s that have been TODO for a while.

No issue #, just paying down some technical debt.