Make sure we handle embedded properties as well.