Get out of the way of the where keyword

Closes #52