Slightly improved printing of cstring and struct.
Reverting to use of actual constants.

They are not going to change; and it's much more straight-forward to understand what's going on without another level of indirection.