More progress on better block parsing.