Add infrastructure to choose parser based on date.

Also includes some small fixes