Extend the hardcoded assume_valid_target to an array.

Extend the hardcoded assume_valid_target to an array. #6404