=str #16380 Cleaned up Source/Sink/Key overlap

Refs #16380
Added a ticket for more tests #16433. It compiled before since the types were to broad in the old KeyedSource signature (below).