Added a missing include (not sure how that slipped through) and did some other replacements so the new ast is the source of constants.