Comment formatting updates to fix recent issues.

This fixes tickets #14, #15, and #17.