core/basis: Trim or reorganize a few using lists. Playing around with auto-use restarts and private words.