Some fixes to make blockly core validate better, nothing functionally di...

...fferent.