Simplify option switching; add function name matching