Forgot to add type descriptors to objects in java #536
Metamodel: consider null to be of type null, not Null, special case for get() #538
Tests for #536 #538