Support for core changes.
Merge pull request #198 from csmith/master

Support for core changes.