Eliminate some redundant code.