Some minor cleanup
Closes #1250

Don't know how it happened, but whatever.