Oh fine, let's support the old options if new ones haven't been specified.  Will deprecate back to null soon, this is just to get them migrated.