Bug 862103 - Split GuardShapeOrType into GuardShape and GuardObjectType, r=dvander.