More type cleanup.