fold version macros into runtime functions to avoid cascade rebuilds when modifying the core
fold version macros into runtime functions to avoid cascade rebuilds when modifying the core
typo in last change