Resolved conflict with C++ data structure signatures containing "::". Correct generation of typeof (MEM_MGT) and NULL checks for FK column search (unlikely to be used in a WHERE bounded to a real constraint but still). Tests successful.