Refactored extra_value_source, with help from @twobraids