Refactor executor implementations for new output interface.