Simplify option passing