blocks: stylistic cleanup, enable error checking XML