Moved match() to specific parse functions