Always try to add a default @type and @language

[rknLA]

Fixes #59

In cases where @type was set, but not @language, one or the other would end up being an empty dictionary.

I have not run any tests on this, or added test cases, so that might need to be addressed before merging.