Further lint changes.