Merging in new parser function features.