Take care of editor notes.

This should effectively resolve issue #1, but I would like others to review it first.