Eliminate core dependency on 'terminal' plugin.