Improve handling of multiline statements when comments are embedded between related control structures