More changes to remove trailing 'L's when formatting string with hexadecimals.
Related to commit b57abb694f59cdcfee3aacebed1ee05518b52c33