Created by: rvantonder
Prep to make it easy to compare input/output (planning to remove lucky deduplication)
Updates tests, semantics-preserving.