Change diag() calls to note().
Modularize the handling of virtuoso-style, syntactically invalid blank node IDs in srx parsing.