Correct override logic in 20_setupextrasvar