Improved parser handler macro