Switched how options are handled for Java options.