Switch to using a real parser