Fixed (a) problem with complex YAML entries in headers; (b) death when a cached source file is deleted or a name changed.