Getting rid of some redundancy.