Harmonize code generation templates and make sure all operations are properly annotated