Fixed recursive call to adt-type-constraints
Merge remote-tracking branch 'origin/master'
Modified names-info to use structures rather than lists to try and fix Mac
allegro runtime json-encode problems.
Minor fix