I don't believe we need to keep those as `defrecord`s as we don't actually want them to be public. @brunoro can you please replace them by `defrecordp` definitions?