Nice cleanup. I thought our tests were already hinted, how come this wasn't caught.