Refactor handling of vector-response comparators, prep for #204, remove Source Variable Type