Reduced unnecessary passing of options.