Fix #274.  Code cleanup.