The block closing token should always start with end.
Cleanups and fix block close tag parsing.