This is v3 of id:"1352609175-12790-1-git-send-email-amdragon at mit.edu". Tomi pointed out in [1] that I'd reversed OUTPUT and EXPECTED in the test, which this version fixes. There are no other changes, so I'm marking this patch ready since Ethan and Tomi approved v2.
[1] id:m2obj0ega4.fsf at guru.guru-group.fi
