Clean up and fix subtitle parsing a bit.