@domcleal, agreed.  Best not to break anything existing.