Fixup: the abstraction from earlier