Good catch--I was just wrapping the new logic around some old code and didn't think to clean up the cases.