Revert to cCode refactoring :-)