Changes/additions to input character set handling: