Parser optimization and additional tests.