Eliminate some dumb duplication