rework internal functions - need the parsed list of URIs before massaging; no impact on exposed funcs