generifying block-tmp-store to tmp-store, adding escaping of special characters to tmp-store facilities to fix parsing issues.
fixing self-links to not include enclosing parens (oops)