 (defn literal-block
   "Creates a block by reading a source into memory. The block is given the id
   directly, without being checked."
-  ^Block
+  ^blocks.data.Block
   [id source]
   (let [content (bytes/to-byte-array source)]
     (Block. id

    [this that]
    (compare [id size _attrs]
             [(:id that) (:size that)
              (when (instance? Block that)
                (._attrs ^Block that))]))



            result))))

  (equiv
    [this that]
    (.equals this that))

  (containsKey
    [this k]
