This was mostly a matter of missing traits. A similar change will also
be pushed to the master branch.