Ticket #2827: tweak and cleanup of code in case of --disable-charset option usage.