Improve epub3/jc handling (#40)