Re-organizing parsing code.