Fix performance conern on __set that last commit undid.