More typing cleanup.

Yeesh.