Shuffle parsing code around.