We now have stronger constant string types. Updated test result.
A but more compact logic code.
Small compile fix.
Added missed flags and did a small code abbreviation. It is worrying that the testsuite did not pick this up.