Exploit new per-request lexicon capabilities

With this changeset the per-request lexicon is used.