Moved some NOTEs to -annotated files. Choose template based on syntax???