Get rid of dependency on extend in 101/set