Indeed, your suggestion is improved. I suspect this was a half-done refactor I forgot to clean :S