Refactor: Push splicing out to core.
Core is the only place we touch macros.