Remove unnecessary abstraction around InfoWindow