Simplify Structure::load
Push version check down to Tokenizer

This also caused changes in Parser to use the token enumerator instead
of the tokenizer directly to ensure the version check happens.