Combine two begin/end blocks; drop some comments