Fix parsing of blocks.
Move all parsing of binary operators into one function.