Move to error paths that align with fact-sets.

A step towards #24.