Improve Twitch.tv chapter support (#810)