Cleared a bug that is so embarrassing I'd rather not explain it. (See git log if you're that interested.) Oh yeah, and sorry, God, for committing into master again.