final changes to support Streams change to charsequence support