1.29: make Underscore_Names opt-in