Minor type changes.