Hmn, it wasn't compiling otherwise over here. I assumed it was just a merge error given the wonkiness, and reverted it to your commit.