Now parse table with two rows. Minor improvements.