Some minor cleanup (commit: de8da4c)
Closes #1250Don't know how it happened, but whatever. (commit: f76c684)