Switched the way that Property is type checked since Property has the method .toProperty.