Fixed some useless code duplication in new classes.