Added support for magic constants, improved parser