Make property clearing a bit more rigorous