Bug 935324 - Clean up adding of type properties to objects, r=jandem.