[RFC2603] Extend <const> to include str and structural constants.
#3161
+55
−25
<const> to include str and structural constants.
#3161