The same as was done in #41. (Prep for #34, but it will be refactored for sure.)