Created attachment 325792 [details, diff] patch EAPI4 + use of virtual/ssh. If it is fine for you, please bump.
looks fine. feel free to commit.