Rename 'block' to 'body'.
Update tests.