Moved constants to options hash, see #2