Major effort to plug slot-name leaks.