More minor type changes.