Coloration fixes, simplify "contains" usage

More general "make it work" kind of fixes. Includes changes to support
highlighting of environment variables inside of strings.