constant parsing bugfix
macros invocation bugfix in optional binding context