Cleaning up callback code generation; Fixing a few minor issues, e.g. indentation...