Some cleanup in DIProperty