(RIKEN) Minor (fix comment style).
(RIKEN) Let a block location expands to the point of an END marker.
It is to make a block include trailing comments after the last statement.
Fix not to remove empty ELSE clauses.
It also avoids a side-effect to badly split ELSE-IF to ELSE and IF.