add comma_def example, and minor cleanup