Updates for new bytestring/attoparsec/enumerator etc.