JCLOUDS-750 At the cost of one trivial type adapter, remove lots of junk with google auto.