[adultswim] Add new extractor
[adultswim] Fix tests
Merge remote-tracking branch 'adammw/adultswim'
[adultswim] Simplify (closes #2952)