Make "onevar" check optional

Instead of replacing check for consecutive vars, just add "onevar" option