Add callouts (currently hard-wired with # as comment convention)