Re-work how the toolbox/editor combo is constructed.