Decrease inheritance in Statement

This is a no-op change (it does not change any behavior and can be merged in any branch) split from #268 (a.k.a. #317) to make future patches easier to review.