var renaming; move no-match blocks to fail fast