Improved fix for bug #336
Improved the fix for bug #366 by replacing `tag is \CREMENT` with `val is \++`.