Rework the way some magic methods are implemented on container objects