Closing in on new structure for Elision core.