And some more API work, with Internal Handlers and Lexicon Pages.