Bug fix to deal better when extracting streams. From John Machin, ref
bug tracker id's 1703100 and 2961829.
Authored by: cross 2012-02-13
Parent: [r42]
