Trying to clean up, improve handling of Guava `Optional` type, wrt polymorphic types