Cleaned up my flubbed merge of PR #1006.