Merged in the working semantic analyzer from Ian Tibbets and Steven Morse