Minor tweaks to remove redundancies.