Improve epub parsing.