Refactor to modular include/extend approach to enable hooking and remove evals.