Get rid of LazyWrapper (from sets branch)