Extra Data code factorisation: This shouldn't destroy old support, but please repport any broken stream.