Eliminate duplicate code.
More duplicate code removal.