985: simplify parsing blocks a bit r=pcpthm a=matklad Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>