Add Effective C++ tips 21-25