LOGIC-91: Assorted fixes for constraints / nominal logic interactions.