Created by: rvantonder
Prep for factoring out some common code
Semantics-preserving, just a type change