Small nit - could this be delegated to `self.class.execute`? Help reduce the code paths and whatnot.