I'm leaning this way for now also. It is certainly the more sensible thing to do to protect backwards compatibility. New commit added incorporating this.