Reduce parser size and compile time

Reduce parser size and compile time #75