Better error handling for model parsing and support top-level includes.