Those definitions felt very ad hoc, and were not used a lot in the
codebase, so I simply replaced them with their definition.