Some cleanup of PR #8.