Refactor a little bit of result parsing (mostly, a test commit)