[z2046] Fix some unintended custom literals.

(based on commit 0013661)

(based on commit [s1659] - 7021d03)