Add support for callouts (previously reviewed at e715954)