Fix stupid mistakes in my last commit.  Fixes #7.