NX-526: Be specific about embedded type