Experimental loose toolshelf integration.
Several bits are more relevant to toolshelf.  Start moving them.