finer scoping, better regexen for callout list, labeled lists