Simplify the block structure without changing the behaviour.