Attempt to deal with glyph XXX TODO issues.

[jbearden0]

There are a few "XXX TODO" comments scattered in the code. Most of these I don't know what should be done, much less how to do them. So once most of the other issues are dealt with I need to ask glyph about them.