Oh yeah, sorry, you're right about validate() being called in other places where you don't want to change its semantics, seems like this is a good place to make the change.