Updated ensure_preferential_settings! to allow nil options