Cleanup of PR #18.