Handle scalar at top-level
Allow one flavor of define to work w/AstValue chgs