Whoops, syntax errors *and* a bug in my last commit.