Modify handling of `bodystmt`.
Merge pull request #749 from masamitsu-murase/modify_handling_of_bodystmt

Modify handling of `bodystmt`.