Really fix the constraint inlining