Fix some redundancies.