[#3028] Ensure array on source in various spots. Needs to be dried out further.